* make-dist: It's oldXMenu/compile.com, not oldXMenu/compile.mms.

	Don't try to make links to the RCS or Old subdirectories.
	Use the appropriate extension for the compression type in use.
	Create the tar file in the shell's initial default directory, not
	in ${tempparent}.
	Erase the whole ${tempparent} tree, not just ${tempdir}.

diff --git a/make-dist b/make-dist
index d80eaf10a992d20fbf98cff6fe37d5c3c4a3293b..6212cbf5c4168ad79e26f758780a61e17c8b4db0 100755 (executable)
--- a/make-dist
+++ b/make-dist
@@ -200,16 +200,16 @@ echo "Making links to \`oldXMenu'."
 (cd oldXMenu
  ln *.c *.h ../${tempdir}/oldXMenu
  ln README Makefile Imakefile ChangeLog ../${tempdir}/oldXMenu
- ln compile.mms descrip.mms ../${tempdir}/oldXMenu)
+ ln compile.com descrip.mms ../${tempdir}/oldXMenu)
 
 echo "Making links to \`etc'."
-### Don't distribute = files, TAGS, DOC files, backups, autosaves, or tex litter.
+### Don't distribute = files, TAGS, DOC files, backups, autosaves, or
+### tex litter.
 (cd etc
- ln [0-9a-zA-Z]* ../${tempdir}/etc
+ ln `ls -d * | grep -v 'RCS' | grep -v 'Old'` ../${tempdir}/etc
  cd ../${tempdir}/etc
- rm -f DOC* *~ \#*\# *.dvi *.log *,v core
- rm -fr Old
- rm -f =* TAGS)
+ rm -f DOC* *~ \#*\# *.dvi *.log *,v =* core
+ rm -f TAGS)
 
 echo "Making links to \`cpp'."
 (cd cpp
@@ -279,15 +279,19 @@ if [ "${make_tar}" = yes ]; then
       echo compress
     )`
   fi
+  case "${default_gzip}" in
+    compress* ) gzip_extension=.Z ;;
+    * )         gzip_extension=.z ;;
+  esac
   echo "Creating tar file."
-  (cd ${tempparent}
-   tar cvf - ${emacsname} | ${default_gzip} > ${emacsname}.tar.Z
-  )
+  (cd ${tempparent} ; tar cvf - ${emacsname} ) \
+    | ${default_gzip} \
+    > ${emacsname}.tar${gzip_extension}
 fi
 
 if [ "${clean_up}" = yes ]; then
   echo "Cleaning up the staging directory."
-  rm -rf ${tempdir}
+  rm -rf ${tempparent}
 fi
 
 ### make-dist ends here